* outline.el (outline-regexp, outline-heading-end-regexp): Use

variables, not options (bug#13731).

Setting this as a global option is likely to be useless, because it is
unlikely that all outline file will use the modified regexp.

Additionnally, if one of these variables if set through customize and
the outline keybindings don't work in a standard outline file, it is
hard to know why.

Thanks to T. V. Raman for reporting this.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526d6d0b0fd2a59136d13ee42d9d925b9e4c4258..90bbb4fdbc591b9fb32b661fda02b5f222c92a53 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20  Bastien Guerry  <bzg@gnu.org>
+
+       * outline.el (outline-regexp, outline-heading-end-regexp): Make
+       variables, not options (bug#13731).
+
 2013-02-20  Glenn Morris  <rgm@gnu.org>
 
        * image.el (image-current-frame): Change from variable to function.

diff --git a/lisp/outline.el b/lisp/outline.el
index 24f25fd2fb7d18913fac8c554e44dc7ac8a4b665..0ec5227a2864a7680c596ac4ce75a0197010bc09 100644 (file)
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -43,25 +43,21 @@
   :prefix "outline-"
   :group 'wp)
 
-(defcustom outline-regexp "[*\^L]+"
+(defvar outline-regexp "[*\^L]+"
   "Regular expression to match the beginning of a heading.
 Any line whose beginning matches this regexp is considered to start a heading.
 Note that Outline mode only checks this regexp at the start of a line,
 so the regexp need not (and usually does not) start with `^'.
 The recommended way to set this is with a Local Variables: list
-in the file it applies to.  See also `outline-heading-end-regexp'."
-  :type 'regexp
-  :group 'outlines)
+in the file it applies to.  See also `outline-heading-end-regexp'.")
 ;;;###autoload(put 'outline-regexp 'safe-local-variable 'stringp)
 
-(defcustom outline-heading-end-regexp "\n"
+(defvar outline-heading-end-regexp "\n"
   "Regular expression to match the end of a heading line.
 You can assume that point is at the beginning of a heading when this
 regexp is searched for.  The heading ends at the end of the match.
 The recommended way to set this is with a `Local Variables:' list
-in the file it applies to."
-  :type 'regexp
-  :group 'outlines)
+in the file it applies to.")
 ;;;###autoload(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
 
 (defvar outline-mode-prefix-map